* xdisp.c (display_text_line): We can't use the FRAME_DEFAULT_FACE

	macro here; that's x-specific.  Just don't pass the second
	argument.
	* xfaces.c (compute_glyph_face): Remove the BASIC_FACE argument;
	use F's default face.

diff --git a/src/xfaces.c b/src/xfaces.c
index d2e8322802ebfc924cbbddd3cb832cb531a58e8a..43dc440ae744e7fccb33a3370e377c4bbb734719 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -732,14 +732,13 @@ compute_char_face (f, w, pos, endptr)
    FACE_CODE as the face ID, assuming that ordinarily the face would
    be BASIC_FACE.  F is the frame.  */
 int
-compute_glyph_face (f, basic_face, face_code)
+compute_glyph_face (f, face_code)
      struct frame *f;
-     struct face *basic_face;
      int face_code;
 {
   struct face face;
 
-  bcopy (basic_face, &face, sizeof (struct face));
+  bcopy (FRAME_DEFAULT_FACE (f), &face, sizeof (face));
 
   if (face_code >= 0 && face_code < FRAME_N_FACES (f)
       && FRAME_FACES (f) [face_code] != 0)